Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Apr 2011 14:46:13 +0000 (07:46 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Apr 2011 14:46:13 +0000 (07:46 -0700)
commitccb6b1e93d9f85a35adaa4a69c22a5ffb03b9bae
tree3956f56688ee8f7153196612b265232d2fa5dc70
parenta40f91cc6803d678cfdc003b974a399c16e8ae9b
parentcca2fe10c6fa21d94468820c3419586dfd4e697e
Merge from mainline.
src/ChangeLog